inventory: simplify flow control and load bundles explicitly