Remove reference to GrammarAccessor in module.xml
Add optimization to SOURCE processing which speeds things up if there is only one SOURCE method.
Minor cleanup