More optimizations (still "+" vs "push").