Refactor RnEnv to fix Trac #2901