[Clean] Avoid inline control structures, round 2

Now phpcs has been aware of { indent, let's try more complicated cases.