Misc task-and-comm-related cleanup

r? @brson