WIP.  I need to draw some diagrams here; there is always at least one
conversion that is not right in the round tripping tests, which implies
that there are many others uncaught.