Several more changes working towards freeing wxPi from the RTL-SDR.