More work on the solver infrastructure