Folded the confusing "Transition" enum back into "State" enum.