Merged ObjectDiffEqualsOnlyValueProvidedType annotation with ObjectDiffEqualsOnlyType and did some clean-up