Refactoring.

Cleaning up and make the converter a better default implementation.