Improving expressiveness:

Task tuple was destroying code expressiveness. I apply some refactorings
to fix this.