OCL25 — OCL 2.2 OclState, State, StateExp, StateExpCS, StateValue and StateExpEval

The use of OclState in the specification is not defined in the normative part of the specification, where it appears solely as OclAny.oclIsInState(statespec : OclState).

A corresponding StateExp exists to convey this as a referredState of type State.

Surely the OclState type is redundant and it should be OclAny.oclIsInState(statespec : State)?

The use of OclState in Annex A may be helpful, so perhaps an introduction to Annex A could explain the mappings between the names used for clarity in Annex A and those used in the normative specification.

Aren't a StateValue and StateExpEval needed to define the semantics?

Isn't a StateExpCS needed to define the abstract/concrete syntax? Perhaps this could merge with TypeExpCS, TypeLiteralExpCS as ModelElementLiteralCS.