Simplify definition of EMPTY and fix doc-comment