Flatten ContainerSpec.

Less changes :) honestly it can go either way and this is less typing.