Whitespace production is already optional
Extract method to run a body of statements
Fix rule name underscores in tests, too

This is what happens when tests aren't automatic