Got rid of some gratuitous Task flatmapping, much faster now