Small cleanup items in top/bottom of parse.py.