Don't start a new connection attempt until all in-flight attempts for this peer have finished

Also cleaned up the naming slightly