Simplify

Reducing complexity of the conditions in the hopes of improving testability and portability to next version. Or maybe I just can't stop submitting trivial improvements to a codebase where they do no good? I can't tell.