Moving to two-directive style
Setting option defaults