Properly handle unnamed/untagged instances