Fixes #5066. Empty subtypes are handled the same way for both 'subtype' and 'subtypes'