Further fixes to ensure that ExecutableGrammar version based on mirrors also works.