[BUG] Implement correct normalization rules per current spec.