Ensure Conveyor::on_block_end gets called last