Ongoing SampledProperty refactoring.