Make the need-stub variables accurate and consistent. In the case of