Minor code clean-ups based on FindBugs feedback.
A first real unit test using the new expression/statement parsers.