Various changes needed to bring the rest of the world into line with
@9827321f8b97552ddf04c8936382b6b47938295c (storage services).