Address warnings spewed by splint