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