Slowly massaging top-level PI classes into some kind of shape.