Add a proper environment object w/ accessors