r5944: cleaning up compiler warnings reported by Jason Mader