diff --git a/Frameworks/selection/src/selection.cc b/Frameworks/selection/src/selection.cc
index b5741aa4..c98baa12 100644
--- a/Frameworks/selection/src/selection.cc
+++ b/Frameworks/selection/src/selection.cc
@@ -874,8 +874,11 @@ namespace ng
 
 	ranges_t extend (buffer_t const& buffer, ranges_t const& selection, select_unit_type const unit, layout_movement_t const* layout)
 	{
+		static std::set<select_unit_type> const splittingUnits = { kSelectionExtendToWord, kSelectionExtendToTypingPair, kSelectionExtendToScope, kSelectionExtendToEndOfSoftLine, kSelectionExtendToEndOfIndentedLine, kSelectionExtendToEndOfLine, kSelectionExtendToEndOfParagraph, kSelectionExtendToBeginOfTypingPair, kSelectionExtendToEndOfTypingPair };
+		bool shouldDissect = splittingUnits.find(unit) != splittingUnits.end();
+
 		ranges_t res;
-		citerate(range, (unit == kSelectionExtendToWord || unit == kSelectionExtendToTypingPair || unit == kSelectionExtendToScope) ? dissect_columnar(buffer, selection) : selection)
+		citerate(range, shouldDissect ? dissect_columnar(buffer, selection) : selection)
 			res.push_back(extend(buffer, *range, unit, layout));
 		return sanitize(buffer, res);
 	}