Tidy up deserialization routines
Tidy up deserialization routines

anmar/sunburnt,pixbuffer/sunburnt-spatial,rlskoeser/sunburnt,anmar/sunburnt,pixbuffer/sunburnt-spatial,qmssof/sunburnt,rlskoeser/sunburnt,tow/sunburnt