This implements the changes to the river-layout protocol proposed in the previous commit removing river-options.
Isaac Freund