[TASK] Cleanup: Must use "self::" for local static member reference