Revise the scope of @NotNull annotations