Add: optimize collect of poly terms (2*x*y + 3*x*z) + general speedup