Minor refactor and check statemask for BundleCapabilityCollector