Further tidying up.

That's all she wrote. There are still some know issues.  But this is
about all I can write given the time left.