Some minor exception/bracket cleanup fixes.