PEP8 cleanup after merge.