Update to multibuffer 2.1.0, remove through2-map
2.0.1