Ammends some fringe scenarios with state keys and states

Ammends some fringe scenarios with state keys and states

.. also makes state key a hashcode - to shorten it and because the
   textual key would often not seem quite accurate - even though it
   would accurately fetch the correct state -- and thus could cause
   confusion for one inspecting it