       catch err
       qs[k] = v
 
-  return qs
+  qs
 
 getReferrer = (qs) ->
   if qs.referrer?
-    return qs.referrer
+    qs.referrer
   else
-    return store.get 'referrer'
-
-getMCIds = (qs)->
-  return [qs['mc_eid'], qs['mc_cid']]
+    store.get 'referrer'
+
+getMCIds = (qs) ->
+  [qs['mc_eid'], qs['mc_cid']]
 
 tagNames = []
 for k, v of Shop.Forms
-  tagNames.push(v.prototype.tag.toUpperCase()) if v.prototype.tag?
+  tagNames.push(v::tag.toUpperCase()) if v::tag?
 
 searchQueue = [document.body]
 elementsToMount = []

Shop.initCart = ()->
  @cart.initCart()

Shop.setItem = (id, quantity, locked=false)->
  m.trigger Events.TryUpdateItem, id
  p = @cart.set id, quantity, locked
  if @promise != p

    @data.set 'order.shippingAddress', checkoutShippingAddress
    store.remove 'checkout-shippingAddress'

  @client = new Api
    key:      opts.key
    endpoint: opts.endpoint

