Improve 'type' for ComplexOptCheck and PresenceCheck classes