Refactor of VC's, conjunctions, and expressions complete.