Changed enclosing function of some options.