Fixed the iterator factory type checks and made them less restrictive.

Fixes #182.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git