Renamed _ConstraintDescriptorBuilder_ into _MetaConstraintBuilder_ and pulled it in there. One more common line :-)