Made small changes to fu/trap/main_stage to bring nmigen into line with