Fix If grammars, by adding support for whitespaces, omitted in the language specification. Add tests for If statement and components.