Tidy up.

Embed more logic in the FallbackTypeConverter to simplify usage.