Cleanup after last 10 or so patches now that I have comments from Arv

R=arv
BUG=

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