Better swapping of objects

Signed-off-by: Yoav Schatzberg <yoav@siftscience.com>