Further changes to support curvedev emacs.