How to Build a Better Spouse Trap