fix whitespace/indentation and remove references to ScopedConnectionLists that were...