fix call signatures for drop/swap