Hopefully alleviated some bizarre issues with byte arrays not parsing correctly.