This is just to make the variable names in this function consistent with
the rest of the file (and less confusing). No functional impact, so I'll
commit soon unless someone objects.
Previously, this was part of the memory accounting patch, but that
hasn't made it in yet. Might as well commit the cleanup at least.
Regards,
Jeff Davis
