diff --git a/beetsplug/missing.py b/beetsplug/missing.py
index fe2265da2..48ac11b67 100644
--- a/beetsplug/missing.py
+++ b/beetsplug/missing.py
@@ -17,7 +17,7 @@
 import logging
 
 from beets.autotag import hooks
-from beets.library import Item, Album
+from beets.library import Item
 from beets.plugins import BeetsPlugin
 from beets.ui import decargs, print_obj, Subcommand
 
@@ -61,41 +61,41 @@ def _item(track_info, album_info, album_id):
     t = track_info
     a = album_info
 
-    return Item(
-        album_id =           album_id,
-        album =              a.album,
-        albumartist =        a.artist,
-        albumartist_credit = a.artist_credit,
-        albumartist_sort =   a.artist_sort,
-        albumdisambig =      a.albumdisambig,
-        albumstatus =        a.albumstatus,
-        albumtype =          a.albumtype,
-        artist =             t.artist,
-        artist_credit =      t.artist_credit,
-        artist_sort =        t.artist_sort,
-        asin =               a.asin,
-        catalognum =         a.catalognum,
-        comp =               a.va,
-        country =            a.country,
-        day =                a.day,
-        disc =               t.medium,
-        disctitle =          t.disctitle,
-        disctotal =          a.mediums,
-        label =              a.label,
-        language =           a.language,
-        length =             t.length,
-        mb_albumid =         a.album_id,
-        mb_artistid =        t.artist_id,
-        mb_releasegroupid =  a.releasegroup_id,
-        mb_trackid =         t.track_id,
-        media =              a.media,
-        month =              a.month,
-        script =             a.script,
-        title =              t.title,
-        track =              t.index,
-        tracktotal =         len(a.tracks),
-        year =               a.year,
-    )
+    return Item(**{
+        'album_id':           album_id,
+        'album':              a.album,
+        'albumartist':        a.artist,
+        'albumartist_credit': a.artist_credit,
+        'albumartist_sort':   a.artist_sort,
+        'albumdisambig':      a.albumdisambig,
+        'albumstatus':        a.albumstatus,
+        'albumtype':          a.albumtype,
+        'artist':             t.artist,
+        'artist_credit':      t.artist_credit,
+        'artist_sort':        t.artist_sort,
+        'asin':               a.asin,
+        'catalognum':         a.catalognum,
+        'comp':               a.va,
+        'country':            a.country,
+        'day':                a.day,
+        'disc':               t.medium,
+        'disctitle':          t.disctitle,
+        'disctotal':          a.mediums,
+        'label':              a.label,
+        'language':           a.language,
+        'length':             t.length,
+        'mb_albumid':         a.album_id,
+        'mb_artistid':        t.artist_id,
+        'mb_releasegroupid':  a.releasegroup_id,
+        'mb_trackid':         t.track_id,
+        'media':              a.media,
+        'month':              a.month,
+        'script':             a.script,
+        'title':              t.title,
+        'track':              t.index,
+        'tracktotal':         len(a.tracks),
+        'year':               a.year,
+    })
 
 
 class MissingPlugin(BeetsPlugin):
diff --git a/setup.cfg b/setup.cfg
index c2d9e96e5..7bff445da 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,4 +9,4 @@ ignore=F401,E241
 
 # List of files that have not been cleand up yet. We will try to reduce
 # this with each commit
-exclude=test/*,beetsplug/*,beets/library.py,beets/ui/commands.py,beets/util/functemplate.py
+exclude=test/*,beets/library.py,beets/ui/commands.py,beets/util/functemplate.py