Fixing parser to allow optional whitespace