Reduce use of bitset a little
Remove some dead code and simplify code bodies towards unboxing
Remove use of Token from parser
Missed some more Token usages and removed Token itself