Some cleanup discovered from diffing Chromium-side code.