Interim update in refactoring main BT demod.