A collection of minor type-o fixes. The first two aren't testable, but all...

A collection of minor type-o fixes.  The first two aren't testable, but all tests pass with them.  I stumbled across them while experimenting with a std::move that checks its argument for non-const.  The third corrects a test that is currently failing.

llvm-svn: 190563