Less redrawing if Expando is off

#521