Network.connect & startServer simplified

They were made easier to work with by calling code. The internal
complexity remains the same as before.