Fix issue with transitive dependency ordering.