Fix some issues with pkg-ssh parsing.
Restore the fix partially.
Fix capsicum-less version of pkg-ssh.