Well, I figure we can migrate to `byCodeUnit` once that's merged in. In the mean time, I don't think a unittest should stall this.