Done - did the same with makeHivePartitionRDDs(). There's a bit of overlap in the two methods, though I was hoping to refactor in a following PR to make the diffs cleaner... there's also some other general cleanup, such as removing EmptyRDD from shark.execution.