Rename some things, eliminate some unused variables.