rename EMPTY macro to avoid namespace warning

self-merge