Improve prelude-eval-and-replace
Pull in upstream changes