More carefully distinguish the different server states: 'connecting' is
no longer automatically considered to be up.