Improve specificity of token processing.