[CONFLUENCE] removed redundant value conditions from variables

same as previous PR, but based on newest master. (accidentally closed previous PR and cannot re-open)
@ronie for reviewing (very trivial change)