Reorder some conditions.