#GT-986: small refactoring at src/json