Fixed recursive dependencies. Interdependencies should also work; test cases coming soon.