cleanups (mostly in solver_common)