A few clean-ups for CompositeRadar.