Fix: avoid sending -[setObject:nil forKey:key]