PEP-8 cleanup of inherited code (first pass).