More warning cleanup.