Everything could use more `public static`...