b/16180662 Fixed by triggering the "smarter" logic for determining the t...

...ype of "thing" being created. Only relevant to polymorphic types.