Fix scope resolution for self:: calls