If available, apply networkTimeout to addConnection() as well.  Plus other minor cleanup.