Clean up catch blocks using new java syntax.