Support constraints "none" and null as "no constraint"

Old tests pass!