Changed behaviour of doppelganger to not remove swing or option

Fixes #1348.

http://jenkins.buttonweavers.com:8080/job/buttonmen-blackshadowshade/502/