Reorganise ordering in is_sub_type