am a058f02b: progress towards impression and click stats on all sources, plus some internal cleanup

Merge commit 'a058f02b591d971a829cb1e28d48a992e46ad85e'

* commit 'a058f02b591d971a829cb1e28d48a992e46ad85e':
  progress towards impression and click stats on all sources, plus some internal cleanup