issue 3694: combsimp upgrades