Updates to json marshaling. Thanks @_tomsteele for help with idiomatic GO code.