RF+DOC: PEP8 / docstring fixes from Eric's review

Use 'A is not None' instead of 'not A is None'.

Fix incorrect docstring mentions of 'r+'.