A little reordering of aliases. Still needs a bit more large-scale cleanup.