Not quite related to this PR; but we need to change our factories to return a Lazy instance instead of a builder function. As it stands we're creating a new instance of Converter/Ordinalizer per call!! Not good at all.