Cleanup aliases a little.