Review fixes for Partial Map-Reduce

There were a number of minor issues with the previous several
commits, like the tests running way too long or some cases not
being covered or the code being non-critically suboptimal.

Lets fix them all. The original commits aren't amended so as to
keep their original shape in respect to the external contributor.

NO_DOC=bugfix