One mundane change: Change ReplaceAllUsesOfValueWith to *optionally*