Fix some minor Coverity Scan complaints.