Simple whitespace cleanup, not using new :auto-whitespace feature [BugzId: 169]
Use instaparse's new auto-whitespace feature for simpler handling of
whitespace. [BugzId: 169]