simplify task hacks

@osheroff