> > ...and avoid the forward declaration? > > > > I've seen that in a few places, making the diff smaller here doesn't > > seem worth it v.s. maintaining the definition in two places. > > Sounds good. If we are moving things around anyway, it is probably > a good time to do that, too ;-) OK, I'll do this.