minor grammar factoring
completely rewrote VARIABLE lexer rule, got rid of unnecessary modes