     [start.row, end.row] = @selection.getBufferRowRange()
 
     editor = @selection.editor
-    screenPoint = editor.screenPositionForBufferPosition(end)
-    end = editor.bufferPositionForScreenPosition screenPoint.translate([0, +1]),
-      clip: 'forward'
-      wrapBeyondNewlines: true
+    screenPoint = editor.screenPositionForBufferPosition(end).translate([0, 1])
+    end = editor.bufferPositionForScreenPosition(screenPoint, clipDirection: 'forward')
 
     @setBufferRange([start, end], {preserveFolds: true})
     @resetProperties()


  getNormalizedBufferPosition: ->
    point = @selection.getHeadBufferPosition()
    editor = @selection.editor
    if @isForwarding()
      screenPoint = editor.screenPositionForBufferPosition(point)
      point = editor.bufferPositionForScreenPosition screenPoint.translate([0, -1]),
        clip: 'backward'
        wrapBeyondNewlines: true
    point

  # Return function to dispose(=revert) normalization.
  normalizeBufferPosition: ->

      {editor} = @selection
      start = @selection.getTailScreenPosition()
      if @selection.isReversed()
        end = editor.clipScreenPosition(start.translate([0, -1]), clipDirection: 'backward')
      else
        end = editor.clipScreenPosition(start.translate([0, +1]), clipDirection: 'forward')
      editor.bufferRangeForScreenRange([start, end])

  preserveCharacterwise: ->
