Simplify default option hiding logic.

Does the same job with fewer parts.