More or less revert changes to script-eval.