Clean up code to make Lint happy.