Move more code over to Combine_Default.h and Combine_Ext.h