r11968: More warning fixes. We're on track to getting to double digits for