3712: use factor_terms unconditionally in simplify