Improve computation of interesting objects

Test: Is a pure-refactor change and indeed no-ops test goldens
Change-Id: I12e03866a790f87aa2a35d6845f7e459ac3c1097
6 files changed