Got rid of a couple unneeded assignments.