Very minor improvements to getting data in tasks.