Fix some warnings a bit harder/different

This is an alternate fix to 262378 and a fix to a pessimizing-move
warning.

llvm-svn: 262390
3 files changed