Replaced some bytes.Buffers with xml.(Un)Marshal