Reorganize approach for solution soundness proof.  Cleanup.