Tidy up the poller interfaces

Make them more generic, which means we can ditch a function
1 job for master in 6 minutes and 44 seconds (queued for 5 seconds)