minor improvements by using macros

(0) -30 -10 -1 +1 +10 +30 tip

mercurial