Norm constraint refactor