Merge pull request #18612 from mattwire/tokenprocessorsimplify