Small cleanup

lib/misc.nix

@@ -206,9 +206,7 @@ rec {
     in
       work startSet [] [];
 
-  genericClosure =
-    if builtins ? genericClosure then builtins.genericClosure
-    else lazyGenericClosure;
+  genericClosure = builtins.genericClosure or lazyGenericClosure;
 
   innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else 
         innerModifySumArgs f x (a // b);

lib/modules.nix

@@ -185,8 +185,7 @@ rec {
     ) funs;
 
 
-  moduleMerge = path: modules:
-    let modules_ = modules; in
+  moduleMerge = path: modules_:
     let
       addName = name:
         if path == "" then name else path + "." + name;