I was just working on docs and made the change you'll see in the kjq/seagull1 branch. It's going to conflict with yours slightly -- and I'd like to have the docs agree with the changes you're making -- so I'd actually like to get this PR merged sooner rather than wait for tests unless they're coming tonight.