Issue #2383843: Remove most components, leave NestedArray for unit tests.