What about this:
```python
kwargs['value'] = value
kwargs.update(self.message_values)
self.messages[code] = message.safe_substitute(**kwargs)
```