7895: watch for new atan2 upon splitting equation into real and imag parts

fixes #7895 (see issue for description)

Also, the test for issue 6121 was changed to a simple assertion since the
original issue involved an infinite recursion.