Extend comment handling
Rename a rule in the BNF
Re-generate demo