Rework definitions.