Fix thinko in state handling.
Better static lexical code-gen.