I meant to add to my earlier post for future reference - that last water crossing over the North Fork can be avoided by taking the old trail down to the Portal. Take a right at the John Muir Wilderness sign, just before the North Fork, and you'll come out by the waterfall and wooden bridge near the Portal picnic area. It also cuts 10-15 minutes off the trip down. It's steep and rugged, and not really the best way to head up the trail, but it's a nice alternative to a long rock-hop across the North Fork when you're coming down tired with a heavy pack.