- use RADIX_V4, RADIX_V6, RADIX_V4_ECS, and RADIX_V6_ECS as array indices instead of 0 through 3. - remove some unused macros (cherry picked from commit f7f20b12)