Remove 'else' after 'return'. Fix formatting of a 'switch' statement.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222955 91177308-0d34-0410-b5e6-96231b3b80d8