Style changes to remove wordy brace style on one liners.