Add merge/delete speaker interface.
Placate flake8 a bit - there are a lot of long lines in this file...