I've undone most of the mess I've made of poll. Off to the edge cases.