Check-in more class improvements.

Compiles with both PlotExtract and QGenRecon.  Not tested.