More refactoring of SymbolicOCP (2) #1024