Just to make it clear, my scheduled transfer is all within PVG - having been there before (without transfer) and seeing the lines does not make me look forward to having to clear immigration and customs, and then exit to domestic check-in lines.