Revert "Simplifying some conditions."

This reverts commit 5ad57e14acfe93e4861cc2b71cf854413cc57638.

doing the comparison prevents us from evaluating to "".

reverting.