Minor refactor: remove some duplication in Definition.