Improve enumeration routines.