Refactor data structures for active diagnostic requests.