More progress on Constraints metadata implementation.