Swap out self:: for static::