a bit of cleanup with the block-invokable