Fix vclock/sibling code, extract mapreduce