diff --git a/rc/cabal.kak b/rc/cabal.kak
index c280e4e89..93abafa4e 100644
--- a/rc/cabal.kak
+++ b/rc/cabal.kak
@@ -29,11 +29,8 @@ addhl -group /cabal/code regex ^\h*([A-Za-z][A-Za-z0-9_-]*)\h*: 1:identifier
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _cabal_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _cabal_indent_on_new_line %[
diff --git a/rc/coffee.kak b/rc/coffee.kak
index 2d2cc4209..b77325925 100644
--- a/rc/coffee.kak
+++ b/rc/coffee.kak
@@ -50,11 +50,8 @@ addhl -group /coffee/code regex \<(break|case|catch|class|const|continue|debugge
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _coffee_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _coffee_indent_on_new_line %{
diff --git a/rc/css.kak b/rc/css.kak
index 4eae71665..a8af297bb 100644
--- a/rc/css.kak
+++ b/rc/css.kak
@@ -41,11 +41,8 @@ addhl -group /css/selector regex [*]|[#.][A-Za-z][A-Za-z0-9_-]* 0:identifier
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _css_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _css_indent_on_new_line %[
diff --git a/rc/cucumber.kak b/rc/cucumber.kak
index fd3a557ed..2b0e51d16 100644
--- a/rc/cucumber.kak
+++ b/rc/cucumber.kak
@@ -61,11 +61,8 @@ addhl -group /cucumber/code regex \<(Feature|Business\h+Need|Ability|Background|
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _cucumber_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _cucumber_indent_on_new_line %{
diff --git a/rc/fish.kak b/rc/fish.kak
index bf20a4d65..b08e7e70c 100644
--- a/rc/fish.kak
+++ b/rc/fish.kak
@@ -34,11 +34,8 @@ addhl -group /fish/code regex \<(and|begin|bg|bind|block|break|breakpoint|builti
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _fish_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _fish_indent_on_char %{
diff --git a/rc/haml.kak b/rc/haml.kak
index 20a898e9d..65e09a314 100644
--- a/rc/haml.kak
+++ b/rc/haml.kak
@@ -38,11 +38,8 @@ addhl -group /haml/code regex ^\h*%([A-Za-z][A-Za-z0-9_-]*)([#.][A-Za-z][A-Za-z0
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _haml_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _haml_indent_on_new_line %{
diff --git a/rc/haskell.kak b/rc/haskell.kak
index 1a59927ea..f3fb6c80a 100644
--- a/rc/haskell.kak
+++ b/rc/haskell.kak
@@ -36,11 +36,8 @@ addhl -group /haskell/code regex \<(Int|Integer|Char|Bool|Float|Double|IO|Void|A
 # http://en.wikibooks.org/wiki/Haskell/Indentation
 
 def -hidden _haskell_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _haskell_indent_on_new_line %{
diff --git a/rc/html.kak b/rc/html.kak
index 6dd36882b..14f2dd272 100644
--- a/rc/html.kak
+++ b/rc/html.kak
@@ -38,11 +38,8 @@ addhl -group /html/tag/content/string fill string
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _html_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _html_indent_on_char %{
diff --git a/rc/javascript.kak b/rc/javascript.kak
index 6c5e3b101..86e0b9f39 100644
--- a/rc/javascript.kak
+++ b/rc/javascript.kak
@@ -40,11 +40,8 @@ addhl -group /javascript/code regex \<(break|case|catch|class|const|continue|deb
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _javascript_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _javascript_indent_on_char %<
diff --git a/rc/json.kak b/rc/json.kak
index dcc18db3f..0882ec2ec 100644
--- a/rc/json.kak
+++ b/rc/json.kak
@@ -26,11 +26,8 @@ addhl -group /json/code regex \<(true|false|null)\> 0:value
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _json_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _json_indent_on_char "
diff --git a/rc/lisp.kak b/rc/lisp.kak
index 84e9e86db..77c316796 100644
--- a/rc/lisp.kak
+++ b/rc/lisp.kak
@@ -31,11 +31,8 @@ addhl -group /lisp/code regex \<(def[a-z]+|if|do|let|lambda|catch|and|assert|whi
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _lisp_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _lisp_indent_on_new_line %{
diff --git a/rc/markdown.kak b/rc/markdown.kak
index 6947265e5..1573ef5a3 100644
--- a/rc/markdown.kak
+++ b/rc/markdown.kak
@@ -52,8 +52,8 @@ def -hidden _markdown_indent_on_new_line %{
     eval -draft -itersel %{
         # preserve previous line indent
         try %{ exec -draft <space> K <a-&> }
-        # filter previous line
-        try %{ exec -draft k : _markdown_filter_around_selections <ret> }
+        # remove trailing white spaces
+        try %{ exec -draft -itersel %{ k<a-x> s \h+$ <ret> d } }
         # copy block quote(s), list item prefix and following white spaces
         try %{ exec -draft k x s ^\h*\K((>\h*)|[*+-])+\h* <ret> y j p }
     }
diff --git a/rc/python.kak b/rc/python.kak
index 981137fd4..4891f2004 100644
--- a/rc/python.kak
+++ b/rc/python.kak
@@ -38,11 +38,8 @@ addhl -group /python/code regex \<(bool|buffer|bytearray|complex|dict|file|float
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _python_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _python_indent_on_new_line %{
diff --git a/rc/ragel.kak b/rc/ragel.kak
index bb2748efb..4d7ecd2e0 100644
--- a/rc/ragel.kak
+++ b/rc/ragel.kak
@@ -34,11 +34,8 @@ addhl -group /ragel/code regex \<(action|alnum|alpha|any|ascii|case|cntrl|contai
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _ragel_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _ragel_indent_on_char "
diff --git a/rc/ruby.kak b/rc/ruby.kak
index 2871de4b6..6c4ae28f0 100644
--- a/rc/ruby.kak
+++ b/rc/ruby.kak
@@ -60,11 +60,8 @@ addhl -group /ruby/code regex \<(alias|and|begin|break|case|class|def|defined|do
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _ruby_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _ruby_indent_on_char "
diff --git a/rc/rust.kak b/rc/rust.kak
index a69cd811f..7577912cb 100644
--- a/rc/rust.kak
+++ b/rc/rust.kak
@@ -36,11 +36,8 @@ addhl -group /rust/code regex \<(Share|Copy|Send|Sized|Add|Sub|Mul|Div|Rem|Neg|N
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _rust_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _rust_indent_on_new_line %~
diff --git a/rc/sass.kak b/rc/sass.kak
index f1f61ab53..ba66f2a8a 100644
--- a/rc/sass.kak
+++ b/rc/sass.kak
@@ -34,11 +34,8 @@ addhl -group /sass/code regex !important 0:keyword
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _sass_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _sass_indent_on_new_line %{
diff --git a/rc/scala.kak b/rc/scala.kak
index 1a55ca49c..565725f26 100644
--- a/rc/scala.kak
+++ b/rc/scala.kak
@@ -39,11 +39,8 @@ addhl -group /scala/code regex "'[_A-Za-z0-9$]+" 0:identifier
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _scala_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _scala_indent_on_new_line %[
diff --git a/rc/yaml.kak b/rc/yaml.kak
index 16643ccd9..8a0ab8299 100644
--- a/rc/yaml.kak
+++ b/rc/yaml.kak
@@ -32,11 +32,8 @@ addhl -group /yaml/code regex \<(true|false|null)\> 0:value
 # ‾‾‾‾‾‾‾‾
 
 def -hidden _yaml_filter_around_selections %{
-    eval -draft -itersel %{
-        exec <a-x>
-        # remove trailing white spaces
-        try %{ exec -draft s \h+$ <ret> d }
-    }
+    # remove trailing white spaces
+    try %{ exec -draft -itersel <a-x> s \h+$ <ret> d }
 }
 
 def -hidden _yaml_indent_on_new_line %{