Handle MOJO_TOK_WHILE in mojo_dumptok
Remove redundant includes
Tweak comment style