Little bit of tidying, playing with examples.  (Still having trouble with tests failing because DB doesn't propagate conflict files fast enough.  But I've got a better idea how to deal with that...)