Some more refactoring, and changes to aliases.