Corrected a number of outstanding regressions.

And we inch closer to a gentler pablum...