Conversion to new-style classes