[flang] Restore readability improvement from code review comment that did not...

[flang] Restore readability improvement from code review comment that did not make it into a merge into master, and repair expected test results.

Original-commit: flang-compiler/f18@4f1946765e5a3d6ad013e6342f3762d62a67f363
Reviewed-on: https://github.com/flang-compiler/f18/pull/255