Remove another pattern matching in MappedValuesRDD and revert some changes in PairRDDFunctions