Light syntax changes and code generator for If.

Clean up lexer and simply parser.