Add comment regarding SI-5688.
Rename normalize -> normalizeModifiers.

Have to have fewer things called "normalize" to make any
sense of all the normalize calls.