Small solver refactorings.