Summary: Mostly cleaning up interfaces and making it easier to parse.

Test Plan: Existing test

Reviewers: michelle, philkuz

Reviewed By: michelle, philkuz

Differential Revision: https://phab.corp.pixielabs.ai/D9681

GitOrigin-RevId: de1f11838845b5ce8612655a8b030a8c9bb1d4b2