Make sure we do the $^A..Z check before the mainline check