Bug 872388 - Cleanup review nits. r=bnicholson