Commented everything (although it doesn't really mesh well with the old
grammar and our changes, also I need to reformat mine to match the
correct regex form for optional, repeated, etc)