Tidy up away states in Connection.