Proxy command formatting now recognises `%proxyhost' and