Use TaskHelpers

Also a bit of cleanup.