There are a handful of places where the GUI code could use the storage
module directly; converting those is for a later change.