APF-1454: Simplify dependency management.