Distinguish get_next and get_token, clean up the code there.
Some more work on expandable primitives (input, scantokens...).