Implement new Wxx constraints.