fix some issues that were hidden when Perl6::Grammar's tokens were in use