Changed behaviour of doppelganger and morphing to not remove swing or option

Fixes #1348. Fixes #1386.