Bug 851270 - follow up: pep8 fixes. r=Callek