identify composite generators when solving

[smichr]

from this SO the following error is received

NotImplementedError: multiple generators [s, log(s**2 + x**2)]
No algorithms are implemented to solve equation -5*s**2 - 5*x**2 + 5*log(s**2 + x**2) + 7

But if you replace s**2 with y - x**2 (recognizing the combined generator of s**2 + x**2) and solve for y an answer can be found. I think this can/should happen automatically.