Clean up some ugliness in superenv.rb