Remove some clang -Weverything warnings.
Merge branch 'master' into dev
Revert "Merge branch 'master' into dev"

This reverts commit d4cb506d4b3c29dba1b4f27fa109b80b33bd6d1b, reversing
changes made to dfe201e3c1e9f184a3967719dbb0e59ef12ed54b.