Add ConstraintSyntaxNew macros