r20101: Also rename a variable now that the unused parameter is gone