Deal with ModelTypes where json->native->json doesn't roundtrip correctly