Refactor Option.isDefined checks.

Next up is Option.isEmpty, but that will likely require non-local
changes.