Break `fix_envs()` into multiple post-processing functions

The `fix_envs()` function is too long, and hard to debug now. At some point soon it should be broken up into multiple post-processing functions to aid in debugging and for isolation purposes.