Store by type, don't store the type in things.