SXElement --> SX inside SymbolicOCP #982 #1024
Further cleanup of SymbolicOCP #1024
Fixed indent, SymbolicOCP
More refactoring of SymbolicOCP #1024