Reorganized statements into blocks.
A bit of refactoring for blocks and bodies.