ConcurrentHashMap backed sets to avoid concurrent modification exceptions

Using the sledgehammer of ConcurrentHashMap to avoid concurrent modification exceptions. Not an elegant fix of the root cause (newMarkers in markerModifier tasks?), but makes the problem stop occurring.
same here.