Add some XXX comments about when we should re-poll