diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 8d3b8a289d..5cb55bfa2a 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -207,6 +207,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
 		_label_offset = 12.0 * scale;
 		break;
 
+	case PunchIn:
+	case LoopStart:
 	case SessionStart:
 	case RangeStart:
 		points = new ArdourCanvas::Points ();
@@ -219,6 +221,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
 		_label_offset = 8.0 * scale;
 		break;
 
+	case PunchOut:
+	case LoopEnd:
 	case SessionEnd:
 	case RangeEnd:
 		points = new ArdourCanvas::Points (); // leaks
@@ -231,50 +235,6 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
 		_label_offset = 0.0 * scale;
 		break;
 
-	case LoopStart:
-		points = new ArdourCanvas::Points ();
-		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (MH, MH));
-		points->push_back (ArdourCanvas::Duple (0.0, MH));
-		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-
-		_shift = 0 * scale;
-		_label_offset = MH;
-		break;
-
-	case LoopEnd:
-		points = new ArdourCanvas::Points ();
-		points->push_back (ArdourCanvas::Duple (MH,  0.0));
-		points->push_back (ArdourCanvas::Duple (MH, MH));
-		points->push_back (ArdourCanvas::Duple (0.0, MH));
-		points->push_back (ArdourCanvas::Duple (MH, 0.0));
-
-		_shift = MH;
-		_label_offset = 0.0 * scale;
-		break;
-
-	case PunchIn:
-		points = new ArdourCanvas::Points ();
-		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (MH, 0.0));
-		points->push_back (ArdourCanvas::Duple (0.0, MH));
-		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-
-		_shift = 0 * scale;
-		_label_offset = MH;
-		break;
-
-	case PunchOut:
-		points = new ArdourCanvas::Points ();
-		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-		points->push_back (ArdourCanvas::Duple (MH, 0.0));
-		points->push_back (ArdourCanvas::Duple (MH, MH));
-		points->push_back (ArdourCanvas::Duple (0.0, 0.0));
-
-		_shift = MH;
-		_label_offset = 0.0 * scale;
-		break;
-
 	case Cue:
 		float offs = 1.0 * scale;