Bug fixes for Data::Classes, broken out of 1dfd146