A few small parse.py cleanups