Feature/mongo 2.6.5 minor fixes

Minor cleanups while integrating other things with the new AggregationCursor code.