Adjust some indentation.
Cleanup ExecutionBlocks w.r.t. exceptions and leakages.

Note:
  Aggregate not completely checked.
  Left some FIXMEs.