Improvements to integration with RF/MFT
RF/MFT is keeping a fair bit of state around in order to interact.
I've update the code so that it pulls what it needs direct from the
data structures, so in due course we can get rid of it from RF/MFT.