Not in your change set, but this could use this module's get_leader/1 helper function