switch to a single "EMPTY_BUCKET" definition