Destroy copy/pasted code

[cjslep]

As part of this change on two separate occasions I copied/pasted code in two places in the converter.go file. They're marked with TODOs

Each could be unified into a single function, I'm sure. But that file is already needing dear love.