Make User.avatar_kind non-nullable.