Minor refactor of singleton_class_resolution_order