I don't disagree, but I suspect this would involve a much bigger change, going through a lot of existing call sites.