rework handling of re/im in solve