Indeed. I thought I had that there, although maybe it got lost in a recent rebase. I've added it to the finalize handler.