Reduce the cyclomatic complexity of Generator#addState
Pulled out decorating the state from addState
Pull the configuration of the state into the state