I've committed the attached patch to HEAD.
My apologies for not posting the final patch for review prior to committing it -- I sent it to -patches last night, but it didn't get through (I'd imagine due to the former list size limit.)
-Neil