More rework.  Commenting, mostly.