ok can you have a look at https://github.com/jclouds/jclouds/pull/1518?  I can't nit the day away, today, but hopefully this addresses the important semantic issues you raised.