#55: Tighten JSON Factory use