Bring into line with sympy 0.7.5+