Merge pull request #1656 from ericniebler/simpler-env-impl

simplify the implementation of `env<>`

Author: ericniebler