Also forward UE Smart Radio discovery (plus general cleanups)