cleanup the for comprehension syntax

Review by @jsuereth