Add some more requires such that the state machine file can be build as a source root (cause I want to use it for some other stuff :)
Make Enumerable's variables better named so as to be less mystical. Terseness is for suckers.