It seems that both `Text` and `String` are used in many places. Should we make this consistent? My understanding was that `Text` was the preferred way as it's more efficient.