Analogous fix to memset and memcpy rewriting. Don't have a test case

contrived for these yet, as I spotted them by inspection and the test
cases are a bit more tricky to phrase.

llvm-svn: 164691