(aff_combination_expand): Move (T1)(X *+- CST) simplification to ...