r16418: Pull in more Klocwork fixes (up to r16415)