avoid using closures in rejiggered methods (fixes #365)

fixes regression dating to bbafc96

I should have seen this coming. the bad commit uses for comprehensions
on Option in rejiggered methods. with `-Yclosure-elim` it's
fine. without closure elimination, the body of the for ends up in an
inner class, which naturally confused the generator