Remove HsWithBndrs landmine, introduce DataId Constraint