Fix avatar_kind insanity.