Move *all* work to the polling thread

It'll slow down the pour-start, but maybe increase our reliability?