Options should be unwrapped to allow better diff viewing.