further deprecate defined(FOO) but continue to accept it for now