Be a bit more cautious about symplifying equations -- it sometimes fails with an error