Return a dict instead of a storage class, as #python guys advised me on
IRC.