Tightened up some syntax rules for MessageFactoryReader