JohnG. Cleanup aliases and exports to put things
in their place.