diff --git a/autofill.lua b/autofill.lua
index 58502e2..69ece7f 100644
--- a/autofill.lua
+++ b/autofill.lua
@@ -1,4 +1,4 @@
-chunk, scanner = ...;
+local chunk, scanner, maps = ...;
 
 -- Periodically-called function to fill in maps and queue chunks for manual
 -- scanning
diff --git a/init.lua b/init.lua
index 3909a96..a4a731d 100644
--- a/init.lua
+++ b/init.lua
@@ -50,14 +50,14 @@ local util = loadfile(modpath .. "/util.lua") ();
 local biomes = loadfile(modpath .. "/biome_api.lua") (util);
 
 local scanner = loadfile(modpath .. "/scanner.lua") (map_data, chunk);
-local maps = loadfile(modpath .. "/map_api.lua") (map_data, chunk, scanner);
+local maps = loadfile(modpath .. "/map_api.lua") (map_data, chunk);
 local materials = loadfile(modpath .. "/material_api.lua") ();
 local markers = loadfile(modpath .. "/marker_api.lua") (marker_lookup);
 local map_formspec = loadfile(modpath .. "/map_formspec.lua") (map_data, gui, skin, util, biomes, markers);
 local map_item = loadfile(modpath .. "/items.lua") (chunk, marker_lookup, gui, skin, audio, maps, map_formspec);
 loadfile(modpath .. "/commands.lua") (chunk, audio, map_formspec);
 loadfile(modpath .. "/table.lua") (gui, skin, audio, maps, materials, map_item);
-loadfile(modpath .. "/autofill.lua") (chunk, scanner);
+loadfile(modpath .. "/autofill.lua") (chunk, scanner, maps);
 
 -- The API object
 cartographer = {
diff --git a/map_api.lua b/map_api.lua
index 1ea2f8f..6990d03 100644
--- a/map_api.lua
+++ b/map_api.lua
@@ -1,4 +1,4 @@
-local map_data, chunk, scanner = ...;
+local map_data, chunk = ...;
 
 local Map = {};
 Map.__index = Map;