Fix regressions in controller options setup.

Resolves #24.