Prepare for measure refactoring.