More minor fixes

toRtrn in function get_token is now a pointer to a token, rather than a
token itself.