`class` should itself be `static` if possible (hard to tell from diffs, but it looks like everything is passed into it)