Fixes #6617: PEP8 compliance