Sync with grammar.dd