No more catch-all aliases, and default aliases go to a separate file