Refactor MapBuilder#with methods to put - hopefully that should be the end of the breaking changes