minor reorganization of solve
wip

See https://travis-ci.org/smichr/sympy/builds/44230686
and move any tests/changes from wip back to the previous commit.
quick