Minor re-org.