Norm constraint refactor

+1