Move inbuf handling to before the PDU handling