I always prefer to keep PEP 8 guidelines as succinct as possible.  I've looked over Ethan's patch and the other changes suggested in comments and come up with what I think is a simple patch to improve the guidelines.  I don't think we need to go into a lot of detail here, since the primary goal of the change is to relax the constraints to allow the changes in contextlib to not violate PEP 8.