Moving lexical tokens into combined rule

Signed-off-by: ysgard <ysgard@gmail.com>