Make yankstack and surround play nice