Refactor lexing regexp to be more declarative.
Add more lexing rules.