Improve ssh defaults and support per-server usernames

Never use `then` for multi-line `if`.