Refactor to a common structural superclass.