Much better singularity processing

It is still the case that no refinement is done, only adaptively moving the
x-coordinates is done.