I'm going to go ahead and close this bug - I'll be including a patch for the remaining issue as part of my fix for bug #463429.
I'm going to go ahead and close this bug - I'll be including a patch for the remaining issue as part of my fix for bug #463429.