Rework of grammar started.