Alternatively, I could just leave this as is, for now.  We could also make it singleton, since this is a baby step and we're not yet ready to handle a completely dynamic environment (gracefully handle bundles getting added in the middle of runtime, etc.)