Remove function expressions & replace with call method
Beginning work on new unify function
Move env structs out of infer/mod.rs
Switch to new unify code