Trigger: multi-makers won't work after switch to 'per-plane'

[MRiganSUSX]

After recent change to 3 tplinks per APA ('per-plane'), config generation for trigger no longer works if multiple makers are requested.
Example config:

  "trigger": {
    "trigger_activity_plugin": ["TriggerActivityMakerHorizontalMuonPlugin", "TriggerActivityMakerPrescalePlugin"],
    "trigger_activity_config": [ {
            "prescale": 120,
            "adc_threshold": 10000,
            "adj_tolerance": 4,
            "adjacency_threshold": 6,
            "n_channels_threshold": 1,
            "print_tp_info": false,
            "trigger_on_adc": false,
            "trigger_on_adjacency": false,
            "trigger_on_n_channels": true
    }, {} ],
    "trigger_candidate_plugin": ["TriggerCandidateMakerPrescalePlugin", "TriggerCandidateMakerHorizontalMuonPlugin"],
    "trigger_candidate_config": [ {"prescale": 1}, {} ],

Error:

RuntimeError: connect_modules called with invalid parameters. pop_addr (tpsettee_ma_1.input) must be of form <module>.<internal name>, and the module must already be in the module graph! Known modules ['tc_buf', 
'tctee_ttcm_fake', 'tazipper_0', 'tcm_0', 'tctee_chain_0', 'tazipper_1', 'tcm_1', 'tctee_chain_1', 'channelfilter_tplink3', 'channelfilter_tplink4', 'channelfilter_tplink5', 'tam_1_0_0', 'tasettee_region_1_0_0', 'tam_1_0_1', 
'tasettee_region_1_0_1', 'ta_buf_region_1_0', 'tpsettee_ma_1_0', 'tam_1_1_0', 'tasettee_region_1_1_0', 'tam_1_1_1', 'tasettee_region_1_1_1', 'ta_buf_region_1_1', 'tpsettee_ma_1_1', 'tam_1_2_0', 'tasettee_region_1_2_0', 
'tam_1_2_1', 'tasettee_region_1_2_1', 'ta_buf_region_1_2', 'tpsettee_ma_1_2', 'ttcm_fake', 'mlt']

It would appear that only the plane index is missing, but recent change also removed the TPBuffers and therefore TPTees...