Use existing (map :key) convention for env

/cc @drsnyder