For your first one, yes, `InlineFlow` will start to have children. (This will be necessary at some point anyway for `display: inline-block`, which will be handled much the same way—in fact, making inline floats work will do most of the work necessary to make `inline-block` work.)

For your second question, my gut tells me that (1) is probably the best option, because it makes incremental reflow easier if you keep flows that are next to one another in the DOM tree next to each other in the flow tree as much as possible.