#31: Adjusted map, set and their synchronizers to new interface.