Refactor how we handle enums and bundles to prevent unnecessary crashes.