r5961: final round of compiler warning fixes based on feedback from Jason Mader