More worldgen performance work