Task reorg 1 cleanup

I wonder how many of these will look exactly like this.

Maybe extract some of this to a library in the future.