Issue 2334: Use compatibility versions of collections.User{Dict,List,String}