Added support for more #defined? args