Speed up computations in the absence of oblateness by separating the oblate bodies from the spherical ones

The code is not pretty, but it is fast(er).  I'll make it pretty in a future pull request [iraqiinformationminister].