Refactor diagnostic fields for decoding payload.