Rewrote more submodules to use ConstraintKinds

See also 0529157c97f0b67f2e7c78327220ba6a071b2ed8