Implemented bug #781: Easier tracking of result sets. We only do this