Use the slightly more natural API here
Merge pull request #1537 from alex/cleanup-ssh-serialization

Use the slightly more natural API here