Make preserveEnv return a new object

Modifying the object didn't feel quite right, plus this makes the code a
bit more compact.