Tweak syntax rules to deal with consecutive non-terminals better