Start a second refactoring: pushing tenv arg through