Switch to using the new data-converters API (Fixes #1)