Added unapply methods to CSPOMConstraint (using case class here) and
CSPOMVariable for use in pattern matching.