Thrown away the whole token level stuff, since this causes only problems and no
benefit. Fixes #66