WIP: Generalize rerank code to not depend on (Aggregate)FeatureVector objects