Reorganizing how static variables are mapped to formulas in the solver.