Move parsing of comprehensions
Fixes issue #178