Rename {GenericArg,Term}::unpack() to kind()
#141495
Merged
{GenericArg,Term}::unpack() to kind()
#141495