Move remaining options into schema.