Making the parser more complete.
Removing superfluous whitespace from the output.