Apparently GCC 5.3.1 has turned these annoyances into actual warnings
that convert to errors with -Werror.

Change-Id: Ib1567b3fc2cf33a0f6cffac116a06d73912b84df