Clean up and make the compiler happy.