yea, i don't have a great solution there, unfortunately. bundles aren't super composable either.