Removed tokAfterImport, tokType can be tested directly.

Speed tests show the object comparison is statistically exactly as fast as the boolean test.