Enumeration.ValueSet is not ordered. I don't know if it worked on 2.9 reliably. In general, I don't think I made any changes that were not to get a source to compile or a test to pass.