Output 'Editor' and 'Former Editor' when there's only a single one. Rebase tests accordingly.