D2D: More tweaks (partially reverts ccb2731)
Should account for extra padding when #CRLF# is used.