Use new SetOption signatures
14 files changed