Miscellaneous refactoring. Now can join all channels for a given network.