Tried to bring some better order in the constraints.

Made 'ObjectMorphism' analogous to 'ObjectPair', and added 'ObjectPoint'.