Improve util/join-maps