Followup to #272

This fixes a bug where a new reconciliation timer was added on each failover, plus some cosmetic changes.