Slightly better small-window behavior.
Saving further optimization for later.