Finished revising the constraint solver to handle static variables more efficiently.