Major restructuring of get/drop.