Task reorg 1 cleanup

Even if you don't like nesting this under content, could put these in something like TaskProperties.