farm: potential minor improvements to recent instrumentation