First round of Warning cleanup.