Yes - it gets more complicated when you consider types other than ID3.

But I think it would be helpful if we could get this merged first, and then think about where to go next.