Improve token and form detection

Function `->token*` satisfies the control flow requirements set by
annotators and typecheckers to behave as intended.
Refactor annotators

Now using `->token*` function.
Review comments
Update compiled js and sourcemap