Change in otopi[master]: common: pep8-1.5 fixups