Enhance XEmacs compatibility