Moved other tokens from scanner to parser, added parens and comma to scanner.