Code review comment for lp://staging/~kdub/mir/fix-1664562

I agree with Chris, although it's also fine putting a larger cleanup on trunk. Only if you were backporting the fix to a stable branch like lp:mir/0.26 then you should choose the one-liner solution over this.