DG: JSON encoding now styleguide conform.