Request file override constants were doing false positives on null tests. Checking
for if defined() now as well.