Change from older :constraints to lambda syntax