Switch finally cleanups over to being lazy cleanups. We get basically nothing

from the laziness features here except better block ordering, but it removes yet
another CleanupBlock use.

llvm-svn: 108990