Better handling of SSH shortcuts and hosts