Most of the new uses either:
* Replace some uses of `tie`
* bind to pairs when iterating through maps