EDM converter improvements

These commits are fairly simple improvements to the EDM conversion process.

Am I following the correct workflow?  Do I need to open an issue as well?