diff --git a/src/rc/global.kak b/src/rc/global.kak
index fb481414..1915e8f1 100644
--- a/src/rc/global.kak
+++ b/src/rc/global.kak
@@ -1,8 +1,8 @@
-def -env-params \
-    -shell-completion %{ global -c ${kak_param0} } \
+def -shell-params \
+    -shell-completion %{ global -c $1 } \
     tag %{ %sh{
-    if [[ ${kak_param0} != "" ]]; then
-       tagname=${kak_param0}
+    if [[ $1 != "" ]]; then
+       tagname=$1
     else
        tagname=${kak_selection}
     fi
diff --git a/src/rc/grep.kak b/src/rc/grep.kak
index 51e9fbd7..b02657fe 100644
--- a/src/rc/grep.kak
+++ b/src/rc/grep.kak
@@ -1,6 +1,6 @@
-def -env-params grep %{ echo grep in progress, please wait...; %sh{
+def -shell-params grep %{ echo grep in progress, please wait...; %sh{
      output=$(mktemp -t kak-grep.XXXXXXXX)
-     grep -PHn $kak_param0 $kak_param1 $kak_param2 $kak_param3 $kak_param4 >& ${output} < /dev/null &
+     grep -PHn $@ >& ${output} < /dev/null &
      echo "echo
            try %{ db *grep* } catch %{ }
            edit -fifo ${output} *grep*
diff --git a/src/rc/make.kak b/src/rc/make.kak
index e68aeeb9..346c70f0 100644
--- a/src/rc/make.kak
+++ b/src/rc/make.kak
@@ -1,6 +1,6 @@
-def -env-params make %{ echo make in progress, please wait...; %sh{
+def -shell-params make %{ echo make in progress, please wait...; %sh{
      output=$(mktemp -t kak-make.XXXXXXXX)
-     make $kak_param0 $kak_param1 $kak_param2 $kak_param3 $kak_param4 >& ${output} < /dev/null &
+     make $@ >& ${output} < /dev/null &
      echo "echo
            try %{ db *make* } catch %{ }
            edit -fifo ${output} *make*