More tweaks to the storage interface to simplify it

Signed-off-by: David Scott <dave.scott@citrix.com>