Clean up arguments; remove dist.measure argument