Another refactor to solution soundness, now work with lazy construction of valuation.