Bug 1095160 - Run add_swap before runner. r=catlee