Silence some pedantic warnings

Noninvasive tweaks to silence some pedantic clang warnings.