General type of states

[mx-psi]

State should be replaced by a variable type to simplify code.

[mx-psi]

Depending on #15, the type may have to be restricted to members of Ord.