Cosmetics plus 'load-prefer-newer' from Emacs24.4