Use better variable names, see comment in previous diff.