Token type
Remove cruft
Remove more cruft
Cruft
Simplify
Add missing files
More
Fix to get-boost
Tidy up
Blah
Pseudo-code