v8.90 fully qulified namespace, removed unnecessary macro checks