[flang] Simplify some of the if-return-else-return expansions while possibly

keeping things readable.

Original-commit: flang-compiler/f18@55b7e18763de2cb786ea03b4813aabd45a507337
Reviewed-on: https://github.com/flang-compiler/f18/pull/170
Tree-same-pre-rewrite: false