Get the non-poll cases working right.