Work on refactored hydration that can detect circular deps