Better order of configuration variables in SolverConf
Geometric restart shuold start higher
Only bump in-clause vars when doing glue-based restarts