Refactor Java 7 usages and dramatically downgrade Closure, to make this thing run under Java 6 :(