Store keys in a normalized rollup fashion

This prevents the need to store the rollup as part of the key, which otherwise would lead to duplicates by using the epoch.