Refactored state representation.

The distinction between single and multiple states
was bad.