tweak grammar to work better with qexps