More improvements to Greenberg of Neron.