Currently these are a mixture of the old method (compile everything, use some) and the new method (only compile what's needed by the suite). Switch everything to use the split out version