[LCG] Fix the bugs that Ben pointed out in code review (and the MSan bot

caught). Sad that we don't have warnings for these things, but bleh, no
idea how to fix that.

llvm-svn: 206646