Fixes from @Nullable to Optional migration.