Improve prelude-eval-and-replace
Merge branch 'master' into prelude-personal