Minor re-ordering.