Changes to the AMCP parser.