Use the options accessor instead of a local.

Closes #2805.