I'm wondering if I need to hoist those into our 3rdparty/... target model, and if so if I'm going to need to maintain parity between those two files