This changes format of tokens, so that more than one can appear in a line. Not moved into working code yet. Sort of a precommit.