[bv-dev] Making ElementDescriptor.Kind a top-level type