One real change - don't hoist something that's trivially rematerializable. It's

possible for it to produce worse code than before.

The rest of this patch is code cleanup.

llvm-svn: 50987