(maint) Fix inconsistency when case option is a Type.

The way the implementation worked made it impossible to differentiate
between an instance and its type.