Fix missed places referencing optimize force flag from removal in commit 1ae8195.