More solver simplifications