r3323: more warning reductions