Simplify default option hiding logic.

Closes #249