Remove extraneous <whitespace> tags from grammar
Add grammar to cabal file