peg.py: some small readability refactoring
grammar.py: more annotations to grammar