Clean up code to appease modern GCC compiler.