Fix for jdk 1.8.0 b95

Collector takes three type parameters now, http://download.java.net/lambda/b95/docs/api/java/util/stream/class-use/Collector.html