Add some more @NotNull annotations.