More work on ssh2 to bring it in line with other exts