Locations now work correctly in the presence of macros.

Eliminated lastTokType, it is no longer in use.