Cleanup '+' and '-' token parsing
Use tPLUS and tMINUS tokens instead of '+' and '-' in parser