Removed env lookup for expressions