Bug 833169 - fixup idents and trim out redundant initialization. r=karlt