Add emms-lastfm-* stuff dropped upstream