Change argument name to match docstring and implementations.
Delete some unnecessary code while I'm here.