Tidy up the return of the solution object

[danmermel]

The object is the same in all cases, but we build it in different ways and in some cases we don't order with the synonym at the top