Finally shaken out bugs related to tuner changing.