fixed ADD_AS_NULL() macro to be efficient and simple.