Improve enumeration performance.