diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index c123806b..8d2f20be 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -10,7 +10,6 @@ local assert = assert
 local loadstring = loadstring
 local ipairs = ipairs
 local pairs = pairs
-local unpack = unpack
 local os = os
 local io = io
 local math = math
@@ -569,7 +568,7 @@ end
 -- @param name Hook name.
 function hooks.user.call(name, ...)
     for name, callback in pairs(hooks[name].callbacks) do
-        callback(unpack(args))
+        callback(...)
     end
 end
 
diff --git a/lib/tabulous.lua b/lib/tabulous.lua
index d7662d35..df1ad6b5 100644
--- a/lib/tabulous.lua
+++ b/lib/tabulous.lua
@@ -159,7 +159,7 @@ function untab(cl)
     local cindex = findkey(tabbed[tabindex][2], c)
 
     if tabbed[tabindex][1] == c then
-        display(tabindex, P.next(tabindex, c))
+        display(tabindex, next(tabindex, c))
     end
 
     table.remove(tabbed[tabindex][2], cindex)