[BF][HK] There still were references to non-existing variables causing fatal exceptions; shortened a few IF statements
[BF][HK] There still were references to non-existing variables causing fatal exceptions; shortened a few IF statements

oss2/var-utils