Cleanup from 'codechecker' review.