Retab code and a bit of cleanup.