Appease -Werror

This untaints some of the code and keeps GCC happy.