Minor re-organization.