Separate itinerary classes for mvn from mov; for tst / teq from cmp / cmn.