Changing more of the env to use the paired binding
Ensuring the lookup still works as before