Obviously, this bit in the last patch:

+          if (NILP (Fmemq (cap, capabilities)))
+            capabilities = Fcons (intern(name), capabilities);

was meant to be

+          if (NILP (Fmemq (cap, capabilities)))
+            capabilities = Fcons (cap, capabilities);


Note to self: DO NOT try to make patches at 4:40am.