Minor cleanup, starting solution soundness.