Cleanup some FIXMEs in the tokenzier

 * Moves some utilities to a separate file.

Change-Id: I7227227f055b4d0b713419bd7b73eeaaacecafb1
Merge "Cleanup some FIXMEs in the tokenzier"