Better organize definitions.