Yeah, this is rather subtle. I lifted it out of the match so that it doesn't get dropped before the end of `lock` as we still need it when we set `owner`.