Better wrap-to-window settings.
Deactivate wrap-width for wrap-to-window too.
Update for 2.1 release.