Fixing up some accidental checks that were using #ifdef when instead sho...

...uld have been using just #if to define the AVALIABLE macro.

It's easy to get stuck in the habit of checking #ifdef :)