Change constraint system to use composition.