Upgrade to functionalgroovy 0.6