Patch attached.
(I honestly don't know what has happened in these conversion paths
before my commit.)

- Andreas