Merge "NumNamedElements() should take an enum param."