Add merge() and update().
Remove reraise in _compat.
Pylint.