Working on the API to FeatureSet a bit.