Some follow-up fixes to r24322.

TBR=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/616843002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24328 ce2b1a6d-e550-0410-aec6-3dcde31c8c00