Treat CBC reporters specially

Involves some cleanup of updateMarkerList().