Convert C_PRIMITIVE_OBJECT constraints to proper tuple-based form.

This probably isn't the ideal representation, and it may be better to separate tuples out as separate objects.