Better collections support

Groovy 2.2.0