Re-structured mapcrafter_markers.cpp a bit.