Continue migration from @Nullable to Optional.