I think this is what you wanted to avoid, and I agree. I hope to next move the logic for TimeInvariantWrapperTransform into this class so that it isn't a hack.