Adapt to renaming of foo_opt() to foo()