json-bind modifications.
Refactoring.