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

  (let [start (datetime->period t-res start)
        end (datetime->period t-res end)
        length (inc (- end start))
        mk-fire-tseries (p/vals->sparsevec start length (FireTuple. 0 0 0 0))]
    (<- [?dataset ?m-res ?t-res ?tilestring ?sample ?line ?ct-series]
        (src ?dataset ?m-res ?t-res ?tilestring ?tperiod ?sample ?line ?tuple)
        (mk-fire-tseries ?tperiod ?tuple :> _ ?tseries)

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