Fixup some analyzer issues.