A bit more PEP8, without undoing all readability.