Do not use dash-functional since it requires Emacs-24.
Merge branch 'emacs-23-compat-fix'