 (defn add-fires
   "Adds together two FireTuple objects."
   [t1 t2]
-  (tupleize (+ (.temp330 t1) (.temp330 t2))
-            (+ (.conf50 t1) (.conf50 t2))
-            (+ (.bothPreds t1) (.bothPreds t2))
-            (+ (.count t1) (.count t2))))
+  (fire-tuple (+ (.temp330 t1) (.temp330 t2))
+              (+ (.conf50 t1) (.conf50 t2))
+              (+ (.bothPreds t1) (.bothPreds t2))
+              (+ (.count t1) (.count t2))))
 
 
 ;; Combines various fire tuples into one.
 (defaggregateop comb
-  ([] (FireTuple. 0 0 0 0))
+  ([] (fire-tuple 0 0 0 0))
   ([state tuple] (add-fires state tuple))
   ([state] [state]))
 

(defmapop [running-fire-sum [start end]]
  "Special case of `running-sum` for `FireTuple` thrift objects."
  [tseries]
  (let [empty (FireTuple. 0 0 0 0)]
    (->> tseries
         (running-sum [] empty add-fires)
         (mk-ts start end))))

      ((c/juxt #'conf-above-50 #'per-day) ?conf :> ?conf-50 ?count)
      (fires-above-330 ?kelvin :> ?temp-330)
      (both-preds ?conf ?kelvin :> ?both-preds)
      (fire-tuple ?temp-330 ?conf-50 ?both-preds ?count :> ?tuple)))

;; ## Fire Queries

