Fix some "Dead nested assignment"s and then kill off some useless
variables related to them.