Unable to destroy EBS based instance in EC2

State machine currently defined for EC2 drivers allow client to 'stop' non-EBS instance which mean that this instance will be destroyed. But this only works for non-EBS instance. If you have EBS instance stop action will just 'stop' the instance and this instance will remain in 'STOPPED' state and need to be destroyed manually using Amazon web interface.

So far I have this solutions:

• Replace 'stop' with destroy, where this action will 'stop' non-EBS instance and 'destroy' EBS instance
• Add 'destroy' action to state machine, where in non-EBS instance this action will return 202 (Accepted) which is AFAIK ok for client.
• Make separate state machine for non-EBS and EBS instances