Fix new config wrapping for InDet and Muon, remove wrapping anti-patterns

See merge request !47550