Yes, the new separate constraint definitely makes sense. The change looks good to me, going to merge it.