DRY up options schemas

DRY up options schemas by putting the server id option in its own
schema, then associating other options into it as necessary for
other schemas.