Bug 825714 followup: Silence various warnings and make various style corrections. r=billm