Moved option set initialization to support code.