#7092: silence more -3 and -Wd warnings
5 files changed