 ;;; Function wrapping
 
 (defn- do-render [C f]
-  (let [res (f (cljs-props C) C (aget "state" C) #_(.-state C))
+  (let [res (f (cljs-props C) C (.-state C))
         conv (if (vector? res)
                (tmpl/as-component res)
                (if (fn? res)

      ;; reset! doesn't call -notifyWatches unless -watches is set
      (set! (.-watches C) {})
      (when f
        (set! (.-cljsOldState C) (merge (aget "state" C)
                                        #_(.-state C) (f C)))))

    :componentWillReceiveProps
    (fn [C props]

    f))

(defn- get-wrapper [key f name]
  (let [wrap (custom-wrapper key f)]
    (when (and wrap f)
      (assert (fn? f)
