Cleanups for eqsolver. Compilation speedup for gui.