Make untokenize handle atoms