define(`TERM_UTF8_BOTRT', `TERM_UTF8 -geometry TERM_GEOM_BOTRT')
-define(`REMOTE_HOST_TERM',
-`$1 -e ssh -4 $2')
+define(`SSH', `ssh -4')
-define(`REMOTE_HOST_TERM_TITLE',
-`$1 -title $3 -n $3 -e ssh -4 $2')
+define(`REMOTE_HOST_TERM', `$1 -e SSH $2')
+
+define(`REMOTE_HOST_TERM_TITLE', `$1 -title $3 -n $3 -e SSH $2')
define(`REMOTE_HOST_KOI8',
REMOTE_HOST_TERM_TITLE(TERM_KOI8, $1, $2))
"$2 (utf8,btrt)" REMOTE_HOST_UTF8_BOTRT($1, $2))
define(`REMOTE_HOST_KOI8_BIG',
-TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e ssh -4 "$1")
+TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e SSH "$1")
define(`REMOTE_HOST_KOI8_BIG_MENU',
"$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2))