Fix an incorrectly named option
Make some of the 'depends_on's simpler

Per the advice of @mistydemeo.