Bug 1071024 - fix style violations.  r=me