Fixed bug where a string would be allocated for a token even if it didn't need it.