This is to address the clean-up comments from http://codereview.appspot.com/4919047/ .
LGTM
Committed revision 2163.