OK. I'll submit Java 7 compatible changes when I get to that part. It saves a few lines and is more readable with the closures but will do without them just as well.