Remove nasldoc-y portions of the grammar.
Rearrange and comment groupings.