PEP 8 fixes.
Incorporate parser code review comments from Jeff, Emily, and Nick.