Took out more unneeded scopes in ThreadNetwork.