Refactoring of data, introducing Weak<> instead of HashMap::find().
Fix away message.