Patch Set 1: I would prefer that you didn't submit this; No score

Code looks good to me as-is, but please squash these two
commits together, abandon this change, and upload the
new squashed commit as a replacement for I908e4c77 so we
have a cleaner project history.