Fix up normalization code.