Improve XEmacs compatibility