This will allow multi-track support when consuming from a SampleSource to be added in a single class, rather than in 6. Prep for Issue #514.
