Remove constrain replacement
Fix addConstraint to not trigger layout
Rename to constrain
Use constrain in specs where appropriate