Remove use of shared EMPTY_OBJECT