Dogfood the simpler version constraints