Updates to bring in line with latest sympy updates. Should work on both new and old versions.