Fix for multi-code-block statements and exit.
Fix for nested scope.
Fix for edge cases where the final block specifier is not caught.