diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index 42462c72..f58c15ca 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -533,9 +533,11 @@
 
 <item>
     <tags>&lt;yank-location> y</tags>
+    <strut/>
     <spec>y</spec>
-    <description short="true">
-        <p>Yank current location to the clipboard.</p>
+    <description>
+        <p>Yank current location to the clipboard. See also
+            <o>yankshort</o></p>
     </description>
 </item>
 
diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 5aaabb71..e86b2b39 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -791,12 +791,12 @@ var DOM = Class("DOM", {
         else
             event = array.toObject([[event, listener]]);
 
-        for (let [k, v] in Iterator(event))
-            event[k] = util.wrapCallback(v, true);
+        for (let [evt, callback] in Iterator(event))
+            event[evt] = util.wrapCallback(callback, true);
 
         return this.each(function (elem) {
-            for (let [k, v] in Iterator(event))
-                elem.addEventListener(k, v, capture);
+            for (let [evt, callback] in Iterator(event))
+                elem.addEventListener(evt, callback, capture);
         });
     },
     unlisten: function unlisten(event, listener, capture) {