Can you please take a look at CodeReview for r100165 and r100310? I'm asking you to do this since it's your code. Thanks.