Some code cleanup. Simple benchmark for composite tasks.