The changes in this file are entirely unrelated to the patch. Unlike above, they also change the behavior of the class -- please take out of this patch and submit separately.