refactor ~ change repair of 'fix `cargo clippy` complaints (fatal/same if clause)'
refactor ~ change repair of 'fix `cargo clippy` complaints (fatal/same if clause)'

.# [why]

The initial refactoring/repair led to comments within if conditions which is
objectionable to some of the devs. So, this changes the refactor to completely split
the if clauses into separate if statements (with corresponding commentary).

Note: this refactor is "less mechanical" and does increase the risk of changing the
actual effect of the code. But the change is small and the tests are passing.

uutils/coreutils,uutils/coreutils,uutils/coreutils