remove empty tokens during first pass-through...

to dramatically increase performance
Merge branch 'dev'