Adapt for renamed variable in newer Emacs versions.