Adapt error-checking code for new names of reserve and residuals.