Minor refactoring of noisy token mangling