Fix some "Dead nested assignment"s and then kill off some useless

2010-08-14, Elliott Sales de Andrade