Task helper tweaks. by: Giles