Don't shortcut redraw flag evaluation
Merge branch 'fix-scroll-off-and-rnu'

Small "optimization" turned out to be a bad idea.

Thanks to filterfalse.