Follow-up to d4940c0f to further limit the transform to avoid an unintended pattern/fold of a constant expression.