Refactored token normalization.