Yes, sadly moving this functionality to the Eucalyptus driver class will require quite a lot of refactoring.

The good thing is that this is a step in a right direction and it would be much appreciated if you can do it.

And opening a new pull request is OK.