We've made some of these transitive before to be safe, worth doing it here too?