SPARK-1822: Some minor cleanup work on SchemaRDD.count()

Minor cleanup following #841.