Refactor aspectPackageFacet to something less complex