In some places, disabling the warnings rather than fixing it required less changes, without compromising readability.
