(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.
Merge pull request #2204 from hlindberg/maint_case-type-option-inconsistent

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