Handle add_poll_id() and add_block_fn() calls at awkward points more correctly.