Cleanup: Clang-Tidy else-after-return fixes

This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule. This should be the final commit of the series of commits that
addresses this particular rule.

No functional changes.

.clang-tidy

@@ -12,7 +12,6 @@ Checks:  >
 
   -readability-misleading-indentation,
 
-  -readability-else-after-return,
   -readability-inconsistent-declaration-parameter-name,
   -readability-redundant-preprocessor,
   -readability-function-size,