Remove tiny unnecessary faff in new SSH-2-only code