Refine grammar to support comments, other features of language.