Before releasing 1.6 we should review #71 once again. Is it a better way to achieve the same thing? Should we really use a `callable`?
