A few more clean-ups for CompositeRadar.