Cleanup of past 5 or 6 patches from review comments

R=arv
BUG=

Review URL: https://codereview.appspot.com/11127043