OK. Actually, here I think I went too far in PEP8'ing, since the test explicitly is for comparison with `None`; I'll revert the whole function (and add a comment)