Further PEP 8 improvements.