Tidy up reading TS packets a bit