Fix option handling for widgets.