Updated for aliases, composer, and typo-remapping.