Follow-up fix to r165928: handle memset rewriting for widened integers,

and generally clean up the memset handling. It had rotted a bit as the
other rewriting logic got polished more.

llvm-svn: 165930