More refactoring in speaker.py and networkmanager.py.