Tidy up header decoding to avoid assigning repeated string splices to scalars
Add decoding for additional 19 headers