Start restructuring the solver a bit.