Fix regression in DefaultAttributeMap / Add Attribute.key() / More fine-grained locking