More cleaning up of divapprox.