Fixed aggr_funs.
- Now can actually do both incremental and non-incremental versions
  correctly.