Some clean-up in CurrentObject?, so that TupleIterator? is no longer faking being a AggregateIterator?.