Fix `emacsclient -ne '(+ 2 2)'' (reported by Han Boetes), and clean up some corner...