That seems better.   Does that mean we can also get rid of "input-block"?

If its possible to move away from presentational semantics like "horizontal", "vertical", "inline", etc., that would be ideal.

How many different pre-canned form layouts are we trying to ship?  Can we narrow it to 2 to start and flesh out from there?