Minor changes to Groovy for comprehension draft