CC-5709: Airtime Analyzer

* A bunch of changes that somehow didn't make it into my last commit...
* confused