The basic -400 wing is a few feet longer than the classic 747 wing, even if you don't include the winglet. The -400D as used by JAL and ANA is a -400 with a classic wing without the tip antenna and with some other structural modifications to provide higher cycle life.