Further XEmacs compat fixup of the last change.