Fix up grammar parser