Cleanup UpdatableBuilderBuilders by making single generic PredictiveModelWithDataBuilderBuilder