diff --git a/lib/awful/button.lua.in b/lib/awful/button.lua.in
index b92db916..38caf9d2 100644
--- a/lib/awful/button.lua.in
+++ b/lib/awful/button.lua.in
@@ -7,7 +7,6 @@
 -- Grab environment we need
 local setmetatable = setmetatable
 local ipairs = ipairs
-local unpack = unpack
 local capi = { button = button }
 local util = require("awful.util")
 
@@ -31,11 +30,11 @@ function new(mod, ...)
     local ret = {}
     local subsets = util.subsets(ignore_modifiers)
     for _, set in ipairs(subsets) do
-        ret[#ret + 1] = capi.button(util.table.join(mod, set), unpack(arg))
+        ret[#ret + 1] = capi.button(util.table.join(mod, set), ...)
     end
     return ret
 end
 
-setmetatable(_M, { __call = function(_, ...) return new(unpack(arg)) end })
+setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/lib/awful/key.lua.in b/lib/awful/key.lua.in
index a76e4f40..4747dd54 100644
--- a/lib/awful/key.lua.in
+++ b/lib/awful/key.lua.in
@@ -7,7 +7,6 @@
 -- Grab environment we need
 local setmetatable = setmetatable
 local ipairs = ipairs
-local unpack = unpack
 local capi = { key = key }
 local util = require("awful.util")
 
@@ -31,7 +30,7 @@ function new(mod, ...)
     local ret = {}
     local subsets = util.subsets(ignore_modifiers)
     for _, set in ipairs(subsets) do
-        ret[#ret + 1] = capi.key(util.table.join(mod, set), unpack(arg))
+        ret[#ret + 1] = capi.key(util.table.join(mod, set), ...)
     end
     return ret
 end
@@ -62,6 +61,6 @@ function match(key, pressed_mod, pressed_key)
     return true
 end
 
-setmetatable(_M, { __call = function(_, ...) return new(unpack(arg)) end })
+setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/lib/awful/widget/button.lua.in b/lib/awful/widget/button.lua.in
index 62891703..4dfa60c5 100644
--- a/lib/awful/widget/button.lua.in
+++ b/lib/awful/widget/button.lua.in
@@ -5,7 +5,6 @@
 ---------------------------------------------------------------------------
 
 local setmetatable = setmetatable
-local unpack = unpack
 local type = type
 local button = require("awful.button")
 local capi = { image = image,
@@ -39,6 +38,6 @@ function new(args)
     return w
 end
 
-setmetatable(_M, { __call = function(_, ...) return new(unpack(arg)) end })
+setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/lib/awful/widget/launcher.lua.in b/lib/awful/widget/launcher.lua.in
index 0a3756c9..80a5715a 100644
--- a/lib/awful/widget/launcher.lua.in
+++ b/lib/awful/widget/launcher.lua.in
@@ -5,7 +5,6 @@
 ---------------------------------------------------------------------------
 
 local setmetatable = setmetatable
-local unpack = unpack
 local util = require("awful.util")
 local wbutton = require("awful.widget.button")
 local button = require("awful.button")
@@ -31,6 +30,6 @@ function new(args)
     return w
 end
 
-setmetatable(_M, { __call = function (_, ...) return new(unpack(arg)) end })
+setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/lib/awful/widget/prompt.lua.in b/lib/awful/widget/prompt.lua.in
index 0da5024d..a071f834 100644
--- a/lib/awful/widget/prompt.lua.in
+++ b/lib/awful/widget/prompt.lua.in
@@ -5,7 +5,6 @@
 ---------------------------------------------------------------------------
 
 local setmetatable = setmetatable
-local unpack = unpack
 
 local capi = { widget = widget }
 local completion = require("awful.completion")
@@ -19,7 +18,7 @@ module("awful.widget.prompt")
 local function run(promptbox)
     return prompt.run({ prompt = promptbox.prompt },
                       promptbox.widget,
-                      function (...) promptbox.widget.text = util.spawn(unpack(arg)) end,
+                      function (...) promptbox.widget.text = util.spawn(...) end,
                       completion.shell,
                       util.getdir("cache") .. "/history")
 end
@@ -38,6 +37,6 @@ function new(args)
     return promptbox
 end
 
-setmetatable(_M, { __call = function (_, ...) return new(unpack(arg)) end })
+setmetatable(_M, { __call = function (_, ...) return new(...) end })
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/lib/awful/widget/taglist.lua.in b/lib/awful/widget/taglist.lua.in
index e4a24ae5..db855b89 100644
--- a/lib/awful/widget/taglist.lua.in
+++ b/lib/awful/widget/taglist.lua.in
@@ -11,7 +11,6 @@ local capi = { widget = widget,
                client = client }
 local type = type
 local setmetatable = setmetatable
-local unpack = unpack
 local pairs = pairs
 local ipairs = ipairs
 local hooks = require("awful.hooks")
@@ -176,6 +175,6 @@ function label.noempty(t, args)
     end
 end
 
-setmetatable(_M, { __call = function(_, ...) return new(unpack(arg)) end })
+setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/lib/awful/widget/tasklist.lua.in b/lib/awful/widget/tasklist.lua.in
index a42cab4e..3740d99c 100644
--- a/lib/awful/widget/tasklist.lua.in
+++ b/lib/awful/widget/tasklist.lua.in
@@ -11,7 +11,6 @@ local capi = { screen = screen,
 local ipairs = ipairs
 local type = type
 local setmetatable = setmetatable
-local unpack = unpack
 local table = table
 local hooks = require("awful.hooks")
 local common = require("awful.widget.common")
@@ -188,6 +187,6 @@ function label.currenttags(c, screen, args)
     end
 end
 
-setmetatable(_M, { __call = function(_, ...) return new(unpack(arg)) end })
+setmetatable(_M, { __call = function(_, ...) return new(...) end })
 
 -- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80