Apply POSIX-standard fixes SC2086, SC2129