Drop some more unused variables.