Clean up & add common-aliases plugin.