Moved state from blocks onto the stack.
Try to fix gcc issue.
Self-review
Dammit gcc!