In one of the TODOs, I explain that whitespace will be refactored and integrated in the state generation directly (or partially, I have to see how the code looks). So yes, this will change.