Correcting 696f8b8.
362362951c regressed handling of optional dependencies.