Minor tweaks to ConstraintsContainer.