diff --git a/rc/base/x11.kak b/rc/base/x11.kak
index 0583d1836..61a065fe6 100644
--- a/rc/base/x11.kak
+++ b/rc/base/x11.kak
@@ -11,7 +11,7 @@ decl str termcmd %sh{
                    'gnome-terminal -e      ' \
                    'xfce4-terminal -e      ' ; do
         terminal=${termcmd%% *}
-        if which $terminal > /dev/null 2>&1; then
+        if command -v $terminal >/dev/null 2>&1; then
             printf %s\\n "'$termcmd'"
             exit
         fi
diff --git a/rc/core/c-family.kak b/rc/core/c-family.kak
index 26d3222cf..ea4351ec0 100644
--- a/rc/core/c-family.kak
+++ b/rc/core/c-family.kak
@@ -283,30 +283,35 @@ def -hidden c-family-insert-include-guards %{
 
 hook global BufNewFile .*\.(h|hh|hpp|hxx|H) c-family-insert-include-guards
 
-decl str-list alt_dirs ".;.."
+decl str-list alt_dirs ".:.."
 
 def c-family-alternative-file -docstring "Jump to the alternate file (header/implementation)" %{ %sh{
-    alt_dirs=$(printf %s\\n "${kak_opt_alt_dirs}" | sed -e 's/;/ /g')
-    file=$(basename "${kak_buffile}")
+    alt_dirs=$(printf %s\\n "${kak_opt_alt_dirs}" | tr ':' '\n')
+    file="${kak_buffile##*/}"
+    file_noext="${file%.*}"
     dir=$(dirname "${kak_buffile}")
 
     case ${file} in
         *.c|*.cc|*.cpp|*.cxx|*.C|*.inl|*.m)
             for alt_dir in ${alt_dirs}; do
                 for ext in h hh hpp hxx H; do
-                    altname="${dir}/${alt_dir}/${file%.*}.${ext}"
-                    [ -f ${altname} ] && break
+                    altname="${dir}/${alt_dir}/${file_noext}.${ext}"
+                    if [ -f ${altname} ]; then
+                        printf 'edit %%{%s}\n' "${altname}"
+                        exit
+                    fi
                 done
-                [ -f ${altname} ] && break
             done
         ;;
         *.h|*.hh|*.hpp|*.hxx|*.H)
             for alt_dir in ${alt_dirs}; do
                 for ext in c cc cpp cxx C m; do
-                    altname="${dir}/${alt_dir}/${file%.*}.${ext}"
-                    [ -f ${altname} ] && break
+                    altname="${dir}/${alt_dir}/${file_noext}.${ext}"
+                    if [ -f ${altname} ]; then
+                        printf 'edit %%{%s}\n' "${altname}"
+                        exit
+                    fi
                 done
-                [ -f ${altname} ] && break
             done
         ;;
         *)
@@ -314,9 +319,5 @@ def c-family-alternative-file -docstring "Jump to the alternate file (header/imp
             exit
         ;;
     esac
-    if [ -f ${altname} ]; then
-       printf %s\\n "edit '${altname}'"
-    else
-       echo "echo -color Error 'alternative file not found'"
-    fi
+    echo "echo -color Error 'alternative file not found'"
 }}
diff --git a/share/kak/kakrc b/share/kak/kakrc
index 4b234fc3b..7a9f1692c 100644
--- a/share/kak/kakrc
+++ b/share/kak/kakrc
@@ -24,17 +24,8 @@ def -params 1 -docstring "colorscheme <name>: enable named colorscheme" \
 
 %sh{
     autoload_directory() {
-        dir=$1
-        for rcfile in ${dir}/*.kak; do
-            if [ -f "$rcfile" ]; then
-                echo "try %{ source '${rcfile}' } catch %{ echo -debug Autoload: could not load '${rcfile}' }";
-            fi
-        done
-        for subdir in ${dir}/*; do
-            if [ -d "$subdir" ]; then
-                autoload_directory $subdir
-            fi
-        done
+        find -L "$1" -type f -name '*\.kak' \
+            -exec printf 'try %%{ source "%s" } catch %%{ echo -debug Autoload: could not load "%s" }\n' '{}' '{}' \;
     }
 
     localconfdir=${XDG_CONFIG_HOME:-${HOME}/.config}/kak