Merge branch 'fix-defaultdict-construction' into 'master'

Replace defaultdict(lambda: set()) with defaultdict(set).

See merge request !149