Add Environment; drive-by cleanup of object accesses