Mixsets: Combining Annotative and Compositional Approaches to Variability and Product Lines