Feature/enhancements

Some of the parenthesis here are not needed, and this is well-suited for a dictionary comprehension.

```python
return {n, t for n, t in tasks.iteritems() if collect(class_name(t))}
```