sanitise grammar: keep syntax in grammar def, use tags more