Remove stray FIXME comment
[ebnf mode] Add
[ebnf mode] Fix coding style, make linter pass
[ebnf mode] Integrate