--- a/bash-completion.sh	Sat Jan 18 16:41:59 2020 +0100
+++ b/bash-completion.sh	Sat Jan 18 20:09:34 2020 +0100
@@ -13,10 +13,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-_relpipe_in_filesystem_scripts() {
-	while read c; do echo ${c:31}; done < <(compgen -c "__relpipe_in_filesystem_script_");
-}
-
 _relpipe_in_filesystem_completion() {
 	local w0 w1 w2
 
@@ -60,7 +56,7 @@
 	elif [[ "$w2" == "--option"        && "x$w0" == "x" ]];    then COMPREPLY=("''")
 	elif [[ "$w1" == "--file"                           ]];    then COMPREPLY=($(compgen -W "${FILE_FIELDS[*]}"  -- "$w0"))
 	elif [[ "$w1" == "--xattr"                          ]];    then COMPREPLY=($(compgen -W "${XATTR_FIELDS[*]}" -- "$w0"))
-	elif [[ "$w1" == "--streamlet"                      ]];    then COMPREPLY=($(compgen -W "$(_relpipe_in_filesystem_scripts)" -- "$w0"))
+	elif [[ "$w1" == "--streamlet"                      ]];    then COMPREPLY=($(while read c; do PATH="$RELPIPE_IN_FILESYSTEM_STREAMLET_PATH" type -P "$c" &>/dev/null && echo "$c"; done < <(PATH="$RELPIPE_IN_FILESYSTEM_STREAMLET_PATH" compgen -A command -- "$w0")))
 	else
 		OPTIONS=(
 			"--relation"