The --emacs trick is no longer needed