Simplify Store(s) and make sure we do NOT end up in circular dependencies.