Refactor ConceptThing into Thing.