Misc. cleanups

So it used to be that badTokenType was always true?