given that we think that the callsite context is of questionable value anyway, it might be worth considering just dropping that