Add `@Nullable`? I know it's committed already, but still ;-)