More conversion work.
[skip ci]