Removed two uses of subset() to eliminate warnings.