Comb cheat

A takeover of https://github.com/sympy/sympy/pull/2087.