Refactor variable renaming to take into account mergepoints and try-ors.
Fix copy propagation bug the caused the all-fail code to be replaced.