Minor reordering.