Reorganize token fields

Fix issue #89 by applying the solution proposed there.

One difference: instead of having `token_max_number` apply to infinite tokens too I decided to remove the effect of `token_min_interval` altogether.