Cleanup else-after-return and add an early-return to llvm-nm