Clean up to use CdefClass.__new__() where possible