Squid: fix grammar (self, static), refactoring (dependency visitor)