Remove hacks for level 1, add a template grammar

t/parser-fuzz now passes correctly, without cheating.