could this be done in the `packageobjects` phase to treat the same concern in one place?