AttributeInstance is essentially a pair of SchemaInstance and string. Since SchemaInstance is already the key, it is conceptually the same to store just the string as the value. The more important change comes the next line, where SchemaInstance is stored as the values, not AttributeInstance, which I believe is the correct implementation.